Somehow lost fix
Merge pull request #38 from sbillard/master

restore lost fix