Bug 702

Fixed, please review.

https://gist.github.com/jchrusciel/720d8a1b33ce3bfad418