Bug 672

https://gist.github.com/rgatkowski/a19fa8df08f5dddc5c1d