Fix issue #37

@yulianglukhenko and @ryanlntn