fix for issue #3598