Better management of lastcall insertion