Forgot to change function signature during merge