Fix issue #295

Fix issue #295