fixed iss0001

This was a really hard issue to fix.
![todd](https://cloud.githubusercontent.com/assets/9560078/4912272/3ae2b5f6-649b-11e4-914b-6c5b1e8ce150.jpg)