Fix star issue