fixing bug!