Fix for g++