A fix for an anomalous crash on production