potential bug fixed