Fixed g++ compatibility