More fixing for handle_info.