Fix compatibility with Nightly 20130913