Fix state validation issue