Update for compatibility with older compilers
Update for compatibility with older compilers