Fix bug again