CIDESCO-LINK issue 89