Fix bug again..