Maybe fix for some crashes