Modification to support older compilers