Fixed both files