Fixes #134