Fix issue #3027