fixing bugs ???