More work on issue #379