Inference issues.
Merge pull request #1 from joneshf/wip/68

Inference issues.