updated fix for #34