fixes #37, for reals this time