Bug fix for Update