slightly better at doing what it says. fix for #332