Fixes #164