fixed crash some more