Fix for nightly changes