Issue 233

This fixes #233