Bug 3411

https://gist.github.com/swierol/154e9576ea91a72fae12