Follow up for for #158

@settinghead please review. In my first fix I didn't fully understand what was going on there.