Try to fix trac #15501