fixed major bug