More workaround for GCC 4.7