fix for issue #3620