Fix change number bug