Fix for issue #4
Fix for issue #4