Ticket #131 (new task)