Follow up Ticket #241502

Follow up Ticket #241502

Follow up Ticket #241502