Fix bug set up