Improve star matching