fixed for latest nightly