Bug 1945

https://gist.github.com/jakubjanuzik/b55187ad651508b7a08f