Fixes #135