Ticket #1576: Fixing regexps