Bug 790

https://gist.github.com/kchomski/3d922961dbf399c81ea3