Compat with nightly