Loading bug fixed