Revert "Fixed Crash"

This reverts commit 5234f11efdbd6e368a9396cdc1d120e7d2b7ddc6.