Trying to fix future crashes on linux