Issue #572 fix

Closes #572