Fixed the previous commit for g++ v4.6