Bug 2390

https://gist.github.com/artpard/12769ad118d41c3954d3