Attempt 2 at fixing component loading bug!