Lepiaf fix issue 26