Fixes #50 too