Fix bug properly.