updated fix for #28