Fixes #121