major bug found and fixed