fix for the ticket TRUNK-4198