Fix for issue #1

Fix for issue #1