Fixed C++11