wrong transition bug fix_v2