STILL fixing GCC