#9523496707569 manage dirty field better