BUG: tentative fix for C++11.