Fixing possible hack point in start list code