Fixed issue with conflicting transitions