Fixing the unstarring bugs.