Won't 2.6 be really pissed of if numberToReturn for normal commands is != 1 or -1 ?