Fixed undefined var names