fixingTOOLS-1730-3