Fixed $name issue