Followup pr226

Try this @sizzlemctwizzle... I'm quite flustered that this happened after many, many, many hours of SOLID coding/testing and this showed up as a failed merge and needs verification... GRR... this is why we can't fall too far behind on prs.

Applies to #226