Fixed crash bug!