Fix Tiphaine's requests