Bug fix for update & complete