fix #595 and fix #550
addressing @adamrp comments
fixing error due to new entry
Merge pull request #644 from antgonza/issue_595

fix #595 and fix #550