fix for #34