fix for issue #572