Fixed for C++11