Bug 775

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