Fix for non-gcc compilers