Fixes #177