follow up ticker

follow up ticker

Follow up Ticket  #180616

Thank you