Crash fix. Hopefully.