Finally fix Trac #3066