Bug 1649

https://gist.github.com/novirael/97b8656dc8041cc86e4e