major bug solved