Second pass at #179