Attempt to fix rare failure to load spin data.  Fixes #632.