Fixing g++ stupidity