First pass at #241