fixed the bugs in Handle2D