Fix TWK-1397