Bug 3019

https://gist.github.com/matlobocki/3a5fa185baca631fe5be