fixed update cascading issue