Improve the pre fix for #87.