fixing bugs
fixing bugs..