Fix multiple entries