potential fix in place, but commented out, need to get more reliable crash for comparison