Fix for updating issues