Lepiaf fix issue 5