Fixed crashes? Fixed crashes