Got rid of bug