Actually was right looked at it too fast. It does need to stay like it was

Revert "fixes for crash"

This reverts commit efb1080f6b533cc4c7da6998e5cfa11cdaff8886.
Reverted stupid commit