Fixes #180