Fix code to allow dots in variables