Modif to comply with convention