Fix issue #88.