This would be great (and is what I previously thought was the case).