Bug 2484

https://gist.github.com/piotr-mazurek/cd3d3a99b7a9c44994e1