Bug 3358

https://gist.github.com/swierol/3625ed0a7b65c6ee2624