fixing bugs 1