Fix for the nightly build