Hmm, yeah. We need to handle this better.