Revert "fixed crash issue"

This reverts commit 7ead4d563ddf725caa5e34c079fbf803db6a90ae.