make compatible with latest nightly