replace fields
fix