fixed more crashes