Fix multiple transition issues