Attempted to fix world loading bug - still broken