Fixed a bug with crashes on reload().