Possible fix for mysterious restore crash