Restcall fix