It seems like we will always overwrite this value on line 846. Should this be an else? Maybe add a test for this guy too?