Fixes UNDERTOW-353