Fixes #10 again