fix resovle-var impls