fix for bug 1354579
Merge pull request #18 from Juniper/chandan_bug_1354581

fix for bug 1354579