Fix data loss during component update