Fix issue #134 opened by mythan.