removed unneed condition check