Add hack for C++11