Fixed bugs. Star