Added fix for gcc 4.8