mostly fixing shape refresh timing