ADEN-1054 Sharethrough fix