[defect] Fix annoying bug