Very good point here, that's definitely bad design on my part, I'll fix it.