Issue #563 extended fix