Fixes #163