Fixes #178