Fixed for g++