Fix for issue #3

Fix for issue #3