fixed handle bug