Fix so on variables