Added a C++11 specific fix.