Bug Fix.
Merge pull request #843 from hitesh96db/bug1

Bug Fix.
Cleanup