Fix sources code duplication