Make old version less dumb