fixes #6682

Love to see this one in 3.0.  Your call though.