It probably is, I think this was just me over engineering for no good reason.  I'll shrink this down by removing the conditional..