Fix issue #149