Fix potential bug