Ticket#5 resolved