Fix for nightly build