Fix for issue #10

Fix for issue #10