Fixed assumption that fastest category is always started first.