gcc 4.8/4.9 compilation fix