Fixed for g++ compilation