Fixed ordering of calls