Issue #572 fix