Bug with $name source fixed