More override check code