GCC 4.8 issue fix