SCIPHONE-1893 Hopefully fixes one of our bigger crashers for Sam's Club