diff --git a/eval.cpp b/eval.cpp
index 0bb8bdd37..bca02c2da 100644
--- a/eval.cpp
+++ b/eval.cpp
@@ -472,7 +472,8 @@ namespace Sass {
 
   Expression* Eval::operator()(Function_Call* c)
   {
-    string full_name(c->name() + "[f]");
+    string name(Util::normalize_underscores(c->name()));
+    string full_name(name + "[f]");
     Arguments* args = c->arguments();
     if (full_name != "if[f]") {
       args = static_cast<Arguments*>(args->perform(this));
diff --git a/parser.cpp b/parser.cpp
index f21752e22..002556dc0 100644
--- a/parser.cpp
+++ b/parser.cpp
@@ -1612,7 +1612,7 @@ namespace Sass {
   Function_Call* Parser::parse_function_call()
   {
     lex< identifier >();
-    string name(Util::normalize_underscores(lexed));
+    string name(lexed);
     ParserState source_position_of_call = pstate;
 
     Function_Call* the_call = new (ctx.mem) Function_Call(source_position_of_call, name, parse_arguments());