addition to commit 4c2db26c186b1c38e835f65407651e076b477a1b to avoid
inconsistency in the model