Try a fix on nightly builds