Fixes #150