UT aligned to fix to issue 513