First attempt at controlling loading bug