I have failing test case. I will update this issue as soon as I provide issue id to pull request with test.