Bugfix for #569

Bugfix for #569