fixed major bug!