Fix #5414

This will probably fix it.

We need a proper shutdown sequence, leaving the map/world should start the dispose chain.