fix general case