Jérôme's fix