one more fix to entity state interceptor.