Tmp fix for modern gcc