Fixed compilation broken by merge with master