fix for 2462 from bitbucket
Merge pull request #472 from Juniper/2462

fix for 2462 from bitbucket