Fix for GCC