-FIXED- loading bug