This fixes #219