Had to add this else so it wouldn't yield twice, decided to reverse conditions then to make it so the standard case was first.