Fixed for latest nightly