Fixed breaking issues.