- fixes Issue #1