Fix TWK-1589