removed 2 bugs