Same modifs than ePrint version