Fix following merge