solved loading bugs