improve starter cases handling