better C++11 support