Fix issue 246.