Fixes Issue #2