fixup issue 593