Got rid of bugs