Fix for glued position and tool tip position