bug fix:crash