Fixing loader bug