fixing some transition issues