TMDM-7649: Fix previous wrong change