Fix for update with conditions