fix for #185
fix for #192