Fix dependent generation