Another try to fix coverage calculation