Issue #11 correct fix :(