Bug 950

https://gist.github.com/kkorekk/d579f105af96d55e7ee7