bugs fixed
bug fix