Fix for some crashes