fix possible potential bug