Trying to fix loading