Fix 2 for g++