Fixed loading bug introduced in 20a2b6