fixed important bug!