Fixed issue MAGN4864

Issue: http://adsk-oss.myjetbrains.com/youtrack/issue/MAGN-4864
@Benglin Please review it. Thanks