fixes all other vars with same problems (last commit)