Update to the earlier fix for 1326969
Merge pull request #35 from Juniper/sb

Sb