Build regex fix