4005 fix

This addresses issue #4005.