Fix issue #148