Fixes issue with conflicting transitions