Bugfix #294

Bugfix for #294.