Fix duplicated conditional