Ticket resolved

draft