Issue 206

Fixes #206.