Fixed some crash