Issue 392

Fixes #392