New proposal to address indefinite jail terms