fix major bug