Pick up fix for UNDERTOW-223