Fix an error due to the recent merge