fixingTOOLS-1730-4