added fix for transitions