Fix for issue #7