major bug finally fixed