First pass at #445