Override state validation fixed