Fixed base ownership counter

A bit of a hack and could be made more efficient but it works