Patched `TypeError: Cannot read property 'latest' of undefined`

don't change unrelated things