V9 Possible Temp Fix for crashes

Based of dev-broken branch.
Will Sync Branches later