First pass at issue #237