Fix TWK-1660