Fixed for nightly build