Fix TW-32862