Fix issue #36

Hi Jeff, I agree with you and made a fix for this issue. Please review it. Thanks.