SQUASH: fixup