fix thing that i forgot to merge before