Fix Prevent issue WGID : 36901