Bug 3396

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