Fixes Issue #10