Enhance #231 : keep implem prototype coherent with its interface