Remove duplication (related to issue 6525)