update/remove: fixed problem with emit callback