fixed fatal crash