Fix for issue #1

Fix: #1