Fix according for Etienne's comments