Fix for latest nightly