Removed duplicated conditional