More fix on c++ 11