Fix for #609 (2nd version)

Fix for #609 (2nd version)