This should improve coverage