Fixes #140