fixes #217, quick merge please

This fixes #217.