fixingTOOLS-1730-2