Fixed bug that caused API calls time outs due to multiple calls on update method