Added a fix for issue #7