fixed all transition cases