Fixes #3 again