Bug fix : fix point picking index