Fix for nightly