Fixes #143 for good