Fix issue 255

Fix issue 255