[JENKINS 16620] Fixing issue