Bugfix issue 327

Fixes Bug 327