update for UI crash bug