Potential fix for crashes