Fix vars?