Trying to get rid of bugs