Fixes #143