Fixes #146