Fix issue #3012