fixed transition stuff