That's a good point. It should probably be handled there