Issue #10 should be fixed