Removed potential bug