fix for #1

fix for #2