Bug 1633

https://gist.github.com/gruber86/1942a77bad4b483c880c