Fixes #139