Move around heat effects to support cancelation through api.
fix OP Warning