fixed crashes yay