Fix TWK-1616