Fix issue #188