First pass at issue #275