fix for issue #3316