Bug 829

https://gist.github.com/kchomski/b4b8539ef20d67863199