More work trying to fix sotrage bug.