Bug 652 new

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