MIPAV workaround