fix unresolved variables problem