Fix error introduced by merge