Fix issue a different way and supress new gcc 4.8 warning