Bug fix in transitions