Fixes #119