Fix for nightly 2014-12-30