Fix double function call

Now with less missing called functions. I think.