issue #3004