Bugfix

Fixed issues with empty user–vars