Fix: Better fix for cleaning vars (i'm tired today)
Fix: Missing empty value