Fix issue #144