Fix last crashes.
YATTAAAAAAAAAAAA