Fix for issue #5