fixup 593 revised