Additional fix for issue 1
Merge pull request #2 from jasonawong/iss1

Additional fix for issue 1