fix #8024 for C++11 too