fixing replace