In which I fix JF's code ;-)