Fixed bug with updating components