Fixed trac #9574