Fix for issue #6