Fix issue #240