Feature/fix 165

fix for #165