Fix for transitions being bugyg