Bug 3361

https://gist.github.com/swierol/d7ccc4d1cf7c804413ac