Properly update handles