That would be great, but hard to reimplement without it being an actual bug again.