Second pass at #252