Fix bug properly