Bug 661

https://gist.github.com/rgatkowski/2509055b9f58c2ffb696