Fixes #144