Fix annoying characters
Ticket #913