Fixing some of the star