Fixes #129