Fixed initial loading issue