g++ bugfix take 2