Bug 2942

https://gist.github.com/add00/2d3155744e9b18050243#file-gistfile1-txt