Fix for HD & empty variables