Fix GCC 4.8 (again)