Fixing problem with name source