Finally fixes #58 - really.