Fix for G++