DG: Fixed invalid API calls (REF-274)