Fixes #137