Fix the one-too-many-stars problem