A final fix for variables