Fix g++ issue