Fix empty variables