Readd invalidate size, but do a check on transitions