fixes Issue #7