Fix issue #3032