Fixes #130 (again! Thanks, Stickly Man!)