Fix failure from #1731

Tests failed on travis after I merged master. This should fix it.