Fix bug with immutable field handling