Fixed fatal bug on GCC
Merge