Fix issue #2973