Final version bug tested