Bug cleaned