fix for issue #2040
Updated Version 3.1.30