better coverage handling