fixing bugs
bug fixed