Fixed error with latest nightly builds