Make it work on nightly