Fix second bug in Trac #4127