Yes, I agree.  It would be better to handle this through the slot for section. I will fix this up some.