Ticket #1206: Solving it in our code