Fix bug more