fix point picking bugs