Adding bugfix
Merge pull request #108 from theharshest/bug-1090923

Adding bugfix