Hotfix checking of defined variables