updated for gcc 4.9.0