Fix for GCC >= 4.9