pull request for ticket Ticket #340