Fixed common field update bug