Hopefully fixed loading issue.