Fix issue #233