Fixed GCC workaround