Fixed compilation problem introduced by merge --squash