fix: ensure we check registered model and not declared models (#2368)

fix: ensure we check registered model and not declared models (#2368) #547