Fixes #174