Bugfix, refactor mishap

We forgot to change place where it is called. Oops!