GCC fixed conflict