Fixed problems with variable import