For ENG-6718, fix problems caused by function signiture mismatch.