Fix for #609

Fix for #609