Keyed count fix