Fixes Issue #7