Try to fix g++