Schema 8 correction