removed potential bug