Fixes #7 (round 2)