[refix] Hotfix checking of defined variables