First pass at issue #379