Just added Jason's fix for delete replacement