Fixing load up problems