Fixes #141