DF-1813 fixed types