fixed transition problem
merged