Fixing trac:12561