fixes Issue #2