Fixes #128