a major bug fixed