Bug 3046

https://gist.github.com/Alkemic/4a794d5b939dbf5c1a33