fixes Issue #1