Fixed buggy get_keypoints