Fixed one crash, but another one occurs on world load