Another little fix. Still has random crashes :(