fixed handle issue