compatibility with latest nightly builds