Fixes Issue #12