Fixed breaking bug