Fix error introduced during merge