Fix for issue #9