Bug 2068

https://gist.github.com/anonymous/b011d422b4022e2b7abc