Nightly Build Fix