Issue#335

Fixes #335