diff --git a/src/rcore/resolver_origin.rs b/src/rcore/resolver_origin.rs
index 9a3f70a..de7c9e3 100644
--- a/src/rcore/resolver_origin.rs
+++ b/src/rcore/resolver_origin.rs
@@ -2,7 +2,7 @@ use super::*;
 
 impl<'a, Ctx: Context<'a>, A: MentionableBase<'a, Ctx>> Point<'a, Ctx, A>
 where
-    A::Fctr: ParseFactory<'a, Ctx>,
+    A::Fctr: FactoryBase<'a, Ctx>,
 {
     /// Make a [Point] from an [Address].
     pub fn from_address(
@@ -43,9 +43,7 @@ fn _resolve_origin<'a, Ctx: Context<'a>, F: ParseFactory<'a, Ctx>>(
         })
 }
 
-impl<'a, Ctx: Context<'a>, F: ParseFactory<'a, Ctx>> Origin<'a, Ctx>
-    for ResolverOrigin<'a, Ctx, F>
-{
+impl<'a, Ctx: Context<'a>, F: FactoryBase<'a, Ctx>> Origin<'a, Ctx> for ResolverOrigin<'a, Ctx, F> {
     type Mtbl = F::Mtbl;
 
     fn factory(&self) -> OFctr<'a, Ctx, Self> {
@@ -54,7 +52,7 @@ impl<'a, Ctx: Context<'a>, F: ParseFactory<'a, Ctx>> Origin<'a, Ctx>
 
     fn resolve(self: Rc<Self>) -> Resolution<'a, Ctx, Self::Mtbl>
     where
-        OFctr<'a, Ctx, Self>: ParseFactory<'a, Ctx>,
+        F: ParseFactory<'a, Ctx>,
     {
         _resolve_origin(self)
     }