Fixes #126