Bug 2065

https://gist.github.com/marek-leszczynski/8c6a3c16eda9fa23656b