Fix and add