fixingTOOLS-2582-2