Add @jimr for #1013 thanks!