Re: A small step towards for solving Ticket 1084