preventative measures for #149