fixed g++