Fixed what the merge before broke