GJP-29: Fixed overlapping bug and marker dropped when mouse goes to fast.