Fix issue #379