loading bug fix