Fix wrong unset calls