Fixes #136