fix for #34
fix #30