Fixed C++0x (missing) support