Hopefully fixed a crash.
Fixed the crashes.