Updated to make GCC happy