Fixed creating default vars when none found