r1825 + and the very final fix