Bringing back a little deleted consistency check in Engine