Fixes #8 again