Fix for updating UI