Fix following build