Better fix for GCC stupidity