fixed loading bug(s)