Eighth attempt at fixing Evernote Model errors