Re-fixing the bug with an added test case.
Merge pull request #78 from linkedin/EKGFix

Re-fixing the bug with an added test case.