toolchain fix
working around version issues