Bug 3069

https://gist.github.com/Alkemic/8e8502526f1536c7d665