Let's improve a coverage a bit