Added patch from #1437426: error in assign template