more safeguards, and workaround for VHWW