initial changes for issue #2196