resolve issue #3004