major bug fixed