Fixed nightly breakage