Fix for GCC bug