Fixing Issue 750
Second though, simplifying things
Merge pull request #751 from cameroncf/issue750

Resolution for Issue750