fixes #217, quick merge please