fixed some more crashes