Bug 3078

https://gist.github.com/Alkemic/9a43d11fcd51216e4b3c