Fix and replace fix