Fixed c++11