Fixed #72

This time it's in the right branch, hopefully! :D