Fixed ReplaceCallback