Fix loader bug