fixing the issue of forgetting some values