Think I'll leave that for another bug, I don't think there's a quick way of fixing that.