fixed crash bug when the data hasn't loaded yet
merge conflict fixed