Fixing TS-1587 make check fails