Fix for issue #1