Fixes #223