Fixed Ticket n°52