Fix based fields