Fix trac ticket 17018