Fixes #138