Right, I'll see what I can come up with to keep simple cases sane