Fixes FL-998 with proposed patch for GCC 4.8.1