fixed for new compilers