Fixed possible hack in starter list code