Fixes #4084: Update now works correctly