Bug 652

https://gist.github.com/rgatkowski/803910230fbbe7fd933c