Addresses #5418

Addresses #5418