Bug 3380

https://gist.github.com/swierol/95459f00bff289983c4e