Fixed incorrect merge

It was missing a function change.