Added 2 bugs