Update Loop bug fix