Fix bug and optimization