Fix issue with new g++