Re-wrote a section of code that created a small coverage hole.