next fix after oe-core merge