fixes #570

So I'm pretty sure this takes care of the issue.