Multiple updates bug fixed