Fixed C++11 compatibility