a little cleanup
resolve crash issue\!