Improve fix to Trac #3007