fix for #1830
Merge pull request #159 from Juniper/anju_b1

fix for #1830