Fixed some weird crash bug, need to report this.