Second try to fix loading