Fix for issue #284

Fix for issue #284