stricter checking for TIMOB-14884 workaround